20140722-2116: Updated logic