Albert's changes