cleaned up inside, everything is still broken