Fixed casting issue and put a placeholder for all the decisions