work bitch v23. improving code