remaining fixes execpt widget method