beta
solved some edition issues