Added few more steps