Trying to fix minor bugs
Comming back to previous version