tweaks and added new key field to data