Added new screens, added method