Polished and added efficient, own-written utilities