Fixed the answer and i'm happy with it