Moved overlay methods to model