Updated

Still some bugs