Feature/improve cases

test (pls ignore)