the develop version almost finished