Fixing some bugs
New pic