Updates

WORK IN PROGRESS, PLEASE CHECK LATER