merge work
moved to addon