Small changes to 7 and 12, added placeholder for 15