Modernized some aspects