Beta release

Code optimized