Changed code to reflect alterations made by Surveyor. Now can handle if there is no placeholder passed.