updated constants and auto removal of gcm