updated to fit naming scheme