Updated sinatra portion