Fixed some logic after testing