Changed structure to allow proper individual operations