Added more behavior