coding (again), migrating old code into new one