Album controller tweaked - BUGGY CODE