removed solution; changed default behaviors