Reverted back to real code, before_create instead of before_save