Feature/changed u and d