Cleaned up level 2