Working Sheeva setup
merged