It works! Few bug fixes