tweaking
adding custom attributes so that things are less hardcodey