Updated code to inclde Liberation