Working version with just one list