Efficiency improved and some functionality completed