Aurora modifications (5.4 ptr compatibility)

T