actually doing things correctly now