changed all variable names to allow proper searching (removed underscores)