cleaned up Gibbs