edited conditional. took out useless data.