changes for added functionality