Initial Patch

Made the changes