merged code with roshan