[Main] Little modifications