commented out some bs functionality