Working on albert's review