fixed some merging issues and now you may do the inline thing which doesnt work