refactroing, additional stuff