I believe there was some more logic before (remoed)