Feature/several changes