O1 done
added changes for predefined functions