Added more helpers and comments