final .1 version. Buggy