Finished stable version and tested