Now handling placeholders, and updated to latest IC commit