Cleaned up scenarios