Saved Setup to database
merge conflict fixes