Bug Fixed!!! Now time for tweaking and pushing