v 0.3 - increasing performance