DO NO MERGE: Feature/improvements