Working beta - latest changes