final modifications v0.1 beta