Cleaned for testing