Enhancement #1 and #2