Merging frank's design again

wow that @fhurtubise is a great guy! ;)