Did some testing (everything seems functional)