should check things correctly now