updated with regular conventions