Making some (an importants) improvements