updated for just on time