moved code to right place