Added new methods and fixed a small issue where the screen got not cleared properly