Minor advancements :)