Modified the code even more