move code to question part