fixed omega calc I think