basic changes to main and sambot