removed duplicate stuff