created bulidable version, bug fixing