Merged with local project; Handled blocks slightly better than before