ADDED LAST STABLE COMMIT (you know, in case we shit the bed)