removes weight, uses Singleton
fixes parser logic