added normal stuff