Made more effectivizations!