Added macro to replace method, making it faster