Cleaned up anton's mess