Removed more ID usage
Added another location