Much more strict now