changed macro for easier initialization