Updated methods and GUI