now fully working. Fixed few issues considering start