Revert "merge done."

This reverts commit d4f4a6d7a2aa1529cba7723145b79b90ad969b1d, reversing
changes made to 23d3b00825c71b91f5e604b54a214a8b9f51979f.
Bug fixes done. Works perfect