Prototip reupload

Fixed buggs