re-factoring
quick fix