this was modified some moreddddddd