changed bootstrapping and removing the common class