updated with latest dev