Merged changes w/ Xandra's