Changed from seperate class