updaed design - separate version