Modified the not working portion