Updated some aspects