merging with new gigs branch