removed functions in order to redesign