Changed setup based on previous class