Before pull
Fixing bugs