Some badly commented functions added