Fixed some important bugs and it works without conditions