Tweaks from class
These should not be here