build changes and no snap bug fix