redone with working specs