Bug Fix w/ data
Post-Compo Version