Link beam stuff added
cleanup