final changes, should be working now