cleaned up 2