Adding flexibiity