final touches, should now be working