added recent changes
updated compile from recent changes