Removed extra cases