fixed issues, working on logic