Imroved working with album mode.