commit 1
Merged zack and oles code