Modified files according to daddy's advices