Made initial changes for brand new forked code