fixed level framwork
merge