Updated to beta version 2