more changing from dev