Updating standalone
making some adjustments