Modified to use containable behavior