Compiled changes from previous commits