debugged these a bit