Setup guard
Updated app to support spark