Merged additions made by vruzeda