added new code style
now passing properties correctly