Merged with Micah and hitt bugs