added weight check, disabled for now