moved simple functionality to main file