final commit (?) everything seems to be working perfectly