Reverted back
Reduced struct size