Cleaned up, all works