normal dev , almost finished