code optimizing, added test brick