Introduced lazy  loading, testing from now on