Separate properly functions