Added smart placement