added check in controller if remove piece is needed