finished 3.3 and changed coding style