changes to po and merged with Dawine's