Updated to not using IDs