Modifications for more flexability